Auto merge of #1537 - ozmorph:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Sun, 19 Apr 2015 01:59:13 +0000 (01:59 +0000)
committerbors <bors@rust-lang.org>
Sun, 19 Apr 2015 01:59:13 +0000 (01:59 +0000)
commit32c0eee1aa31d777b5bf617424edab5171837b1b
tree16196534b479e8b1367eb9dcde73b8bc02f76e79
parent6882352814f684e588f4d010ad4d8a71be12f98a
parenta72ddb73df3af5392333e27fb81c468f84b9c779
Auto merge of #1537 - ozmorph:master, r=alexcrichton

fixes #1536 .  Tested with rustc 1.0.0-nightly (a52182ffd 2015-04-17) (built 2015-04-17).